Change in openvpn[release/2.6]: dco-linux: enforce ifindex only for DEL_PEER notifications
A message that is not in the archive (sent off-list or not yet received): gerrit.1776803704000.I9b1f4fd06c8a02d3f51b6a3bdea2f92191669660@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1636?usp=email
to review the following change.
Change subject: dco-linux: enforce ifindex only for DEL_PEER notifications
......................................................................
dco-linux: enforce ifindex only for DEL_PEER notifications
The unconditional ifindex check introduced by commit e78a8af2f5ce rejects legitimate kernel replies, specifically peer stats responses, because those messages do not carry OVPN_ATTR_IFINDEX.
Move the check into ovpn_handle_del_peer() so it applies only to spontaneous DEL_PEER notifications from the kernel. This keeps response handling working while still filtering foreign-instance notifications.
Github: closes OpenVPN/openvpn#1020
---
M src/openvpn/dco_linux.c
1 file changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/1636/1
src/openvpn/dco_linux.c +17 -17
@@ -857,6 +857,23 @@static int ovpn_handle_del_peer (dco_context_t *dco,struct nlattr *attrs[]) { +/* we must know which interface this message is referring to in order to +* avoid mixing messages for other instances +*/ +if (!attrs[OVPN_ATTR_IFINDEX ]) + { +msg (D_DCO ,"ovpn-dco: Received message without ifindex" ); +return NL_STOP ; + } + +uint32_t ifindex =nla_get_u32 (attrs[OVPN_ATTR_IFINDEX ]); +if (ifindex != dco->ifindex) + { +msg (D_DCO_DEBUG ,"ovpn-dco: ignoring message for foreign ifindex %d" , + ifindex); +return NL_SKIP ; + } +if (!attrs[OVPN_ATTR_DEL_PEER ]) {msg (D_DCO ,"ovpn-dco: no attributes in OVPN_DEL_PEER message" );
@@ -930,23 +947,6 @@return NL_STOP ; } -/* we must know which interface this message is referring to in order to -* avoid mixing messages for other instances -*/ -if (!attrs[OVPN_ATTR_IFINDEX ]) - { -msg (D_DCO ,"ovpn-dco: Received message without ifindex" ); -return NL_STOP ; - } - -uint32_t ifindex =nla_get_u32 (attrs[OVPN_ATTR_IFINDEX ]); -if (ifindex != dco->ifindex) - { -msg (D_DCO_DEBUG ,"ovpn-dco: ignoring message for foreign ifindex %d" , - ifindex); -return NL_SKIP ; - } -/* based on the message type, we parse the subobject contained in the * message, that stores the type-specific attributes. *
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1636?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I9b1f4fd06c8a02d3f51b6a3bdea2f92191669660
Gerrit-Change-Number: 1636
Gerrit-PatchSet: 1
Gerrit-Owner: ralf_lici <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Attention is currently required from: plaisthos, ralf_lici.
cron2 has posted comments on this change by ralf_lici. ( http://gerrit.openvpn.net/c/openvpn/+/1636?usp=email )
Change subject: dco-linux: enforce ifindex only for DEL_PEER notifications
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1636?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I9b1f4fd06c8a02d3f51b6a3bdea2f92191669660
Gerrit-Change-Number: 1636
Gerrit-PatchSet: 1
Gerrit-Owner: ralf_lici <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: ralf_lici <[email protected]...>
Gerrit-Comment-Date: Wed, 22 Apr 2026 05:56:14 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
PATCH 1/1 dco-linux: enforce ifindex only for DEL_PEER notifications
In reply to a message not in the archiveFrom: Ralf Lici <[email protected]...>
The unconditional ifindex check introduced by commit e78a8af2f5ce rejects legitimate kernel replies, specifically peer stats responses, because those messages do not carry OVPN_ATTR_IFINDEX.
Move the check into ovpn_handle_del_peer() so it applies only to spontaneous DEL_PEER notifications from the kernel. This keeps response handling working while still filtering foreign-instance notifications.
Github: closes OpenVPN/openvpn#1020
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1636
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1636
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/dco_linux.c +17 -17
@@ -857,6 +857,23 @@static int ovpn_handle_del_peer (dco_context_t *dco,struct nlattr *attrs[]) { +/* we must know which interface this message is referring to in order to +* avoid mixing messages for other instances +*/ +if (!attrs[OVPN_ATTR_IFINDEX ]) + { +msg (D_DCO ,"ovpn-dco: Received message without ifindex" ); +return NL_STOP ; + } + +uint32_t ifindex =nla_get_u32 (attrs[OVPN_ATTR_IFINDEX ]); +if (ifindex != dco->ifindex) + { +msg (D_DCO_DEBUG ,"ovpn-dco: ignoring message for foreign ifindex %d" , + ifindex); +return NL_SKIP ; + } +if (!attrs[OVPN_ATTR_DEL_PEER ]) {msg (D_DCO ,"ovpn-dco: no attributes in OVPN_DEL_PEER message" );
@@ -930,23 +947,6 @@return NL_STOP ; } -/* we must know which interface this message is referring to in order to -* avoid mixing messages for other instances -*/ -if (!attrs[OVPN_ATTR_IFINDEX ]) - { -msg (D_DCO ,"ovpn-dco: Received message without ifindex" ); -return NL_STOP ; - } - -uint32_t ifindex =nla_get_u32 (attrs[OVPN_ATTR_IFINDEX ]); -if (ifindex != dco->ifindex) - { -msg (D_DCO_DEBUG ,"ovpn-dco: ignoring message for foreign ifindex %d" , - ifindex); -return NL_SKIP ; - } -/* based on the message type, we parse the subobject contained in the * message, that stores the type-specific attributes. *
[Openvpn-devel] [PATCH applied] Re: dco-linux: enforce ifindex only for DEL_PEER notifications
Tested this (on Ubuntu 20.04 with old-DCO) and I can confirm that management "status" is now back to working. Comparison to 2.7/master also clarified what went wrong in the previous backport commit.
Didn't test this on other platforms as only dco_linux.c is changed (BB did, of course).
Your patch has been applied to the release/2.6 branch.
commit adece45628f78aa8f1f997850095bc9a57caefbe (release/2.6)
Author: Ralf Lici Date: Wed Apr 22 07:56:30 2026 +0200
dco-linux: enforce ifindex only for DEL_PEER notifications
Signed-off-by: Ralf Lici <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1636
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36721.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by ralf_lici. ( http://gerrit.openvpn.net/c/openvpn/+/1636?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: dco-linux: enforce ifindex only for DEL_PEER notifications
......................................................................
dco-linux: enforce ifindex only for DEL_PEER notifications
The unconditional ifindex check introduced by commit e78a8af2f5ce rejects legitimate kernel replies, specifically peer stats responses, because those messages do not carry OVPN_ATTR_IFINDEX.
Move the check into ovpn_handle_del_peer() so it applies only to spontaneous DEL_PEER notifications from the kernel. This keeps response handling working while still filtering foreign-instance notifications.
Github: closes OpenVPN/openvpn#1020
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1636
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36721.html
---
M src/openvpn/dco_linux.c
1 file changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/1636/2
src/openvpn/dco_linux.c +17 -17
@@ -857,6 +857,23 @@static int ovpn_handle_del_peer (dco_context_t *dco,struct nlattr *attrs[]) { +/* we must know which interface this message is referring to in order to +* avoid mixing messages for other instances +*/ +if (!attrs[OVPN_ATTR_IFINDEX ]) + { +msg (D_DCO ,"ovpn-dco: Received message without ifindex" ); +return NL_STOP ; + } + +uint32_t ifindex =nla_get_u32 (attrs[OVPN_ATTR_IFINDEX ]); +if (ifindex != dco->ifindex) + { +msg (D_DCO_DEBUG ,"ovpn-dco: ignoring message for foreign ifindex %d" , + ifindex); +return NL_SKIP ; + } +if (!attrs[OVPN_ATTR_DEL_PEER ]) {msg (D_DCO ,"ovpn-dco: no attributes in OVPN_DEL_PEER message" );
@@ -930,23 +947,6 @@return NL_STOP ; } -/* we must know which interface this message is referring to in order to -* avoid mixing messages for other instances -*/ -if (!attrs[OVPN_ATTR_IFINDEX ]) - { -msg (D_DCO ,"ovpn-dco: Received message without ifindex" ); -return NL_STOP ; - } - -uint32_t ifindex =nla_get_u32 (attrs[OVPN_ATTR_IFINDEX ]); -if (ifindex != dco->ifindex) - { -msg (D_DCO_DEBUG ,"ovpn-dco: ignoring message for foreign ifindex %d" , - ifindex); -return NL_SKIP ; - } -/* based on the message type, we parse the subobject contained in the * message, that stores the type-specific attributes. *
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1636?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I9b1f4fd06c8a02d3f51b6a3bdea2f92191669660
Gerrit-Change-Number: 1636
Gerrit-PatchSet: 2
Gerrit-Owner: ralf_lici <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1636?usp=email )
Change subject: dco-linux: enforce ifindex only for DEL_PEER notifications
......................................................................
dco-linux: enforce ifindex only for DEL_PEER notifications
The unconditional ifindex check introduced by commit e78a8af2f5ce rejects legitimate kernel replies, specifically peer stats responses, because those messages do not carry OVPN_ATTR_IFINDEX.
Move the check into ovpn_handle_del_peer() so it applies only to spontaneous DEL_PEER notifications from the kernel. This keeps response handling working while still filtering foreign-instance notifications.
Github: closes OpenVPN/openvpn#1020
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1636
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36721.html
---
M src/openvpn/dco_linux.c
1 file changed, 17 insertions(+), 17 deletions(-)
src/openvpn/dco_linux.c +17 -17
@@ -857,6 +857,23 @@static int ovpn_handle_del_peer (dco_context_t *dco,struct nlattr *attrs[]) { +/* we must know which interface this message is referring to in order to +* avoid mixing messages for other instances +*/ +if (!attrs[OVPN_ATTR_IFINDEX ]) + { +msg (D_DCO ,"ovpn-dco: Received message without ifindex" ); +return NL_STOP ; + } + +uint32_t ifindex =nla_get_u32 (attrs[OVPN_ATTR_IFINDEX ]); +if (ifindex != dco->ifindex) + { +msg (D_DCO_DEBUG ,"ovpn-dco: ignoring message for foreign ifindex %d" , + ifindex); +return NL_SKIP ; + } +if (!attrs[OVPN_ATTR_DEL_PEER ]) {msg (D_DCO ,"ovpn-dco: no attributes in OVPN_DEL_PEER message" );
@@ -930,23 +947,6 @@return NL_STOP ; } -/* we must know which interface this message is referring to in order to -* avoid mixing messages for other instances -*/ -if (!attrs[OVPN_ATTR_IFINDEX ]) - { -msg (D_DCO ,"ovpn-dco: Received message without ifindex" ); -return NL_STOP ; - } - -uint32_t ifindex =nla_get_u32 (attrs[OVPN_ATTR_IFINDEX ]); -if (ifindex != dco->ifindex) - { -msg (D_DCO_DEBUG ,"ovpn-dco: ignoring message for foreign ifindex %d" , - ifindex); -return NL_SKIP ; - } -/* based on the message type, we parse the subobject contained in the * message, that stores the type-specific attributes. *
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1636?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I9b1f4fd06c8a02d3f51b6a3bdea2f92191669660
Gerrit-Change-Number: 1636
Gerrit-PatchSet: 2
Gerrit-Owner: ralf_lici <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>